I'm going to the gym/fitness classes much more often this summer than usual, and I don't have enough workout gear. Does anyone have recs for reasonably priced, good quality camis and tanks WITH a shelf bra? I know Angie swears by BP camisoles, but I would prefer the option of going braless with the extra shelf bra layer for coverage. (I'm a small 32A and will be doing yoga and pilates, so minimal low-impact support is fine.)

Also on the lookout for fitted (but not indecently short) shorts or crops...