Allignment, css and design related fixes