Bug Fixes + Layout changes

Pushing for release tonight with all clients requests