layout improvements
some refactoring, bleh