General Layout and Style stuff

Refactoring wheeeeee