Better layout organization
Avoid guard warnings
Fixes on the css files