Cleaned up styles
Simplified styles
Merge branch 'layout_fix'