Fixed some layout issues and redundant styling