Minor Fixes

- Minor bug fixes
- Added CSS formatting to the screen layouts