Style updates

Cleaned up CSS organization. Further updated layout structure and styles