Fixed css problems
Fixing main layout
Fixed merge conflicts