Fixed some design and CSS issues