Adjusting layout and other adjustments
Merge branch 'master' of https://github.com/shmems11/uncomfort