More layout fixes
Revert "More layout fixes"

This reverts commit 9a273fa33dbba27250fbba47220891885891ce5f.
More JS / CSS fixes