fixed some style and layout issues