Overall Layout updates
Merge branch 'master' of https://github.com/sc0v/trailerapp