Minor layout & CSS changes