Fixed slight layout issues.
Pushing to master lots of fixes