Layout fixes

Fixed layout to be more unified
Removed unnecessary layout files.

Removed unnecessary layout files.
Merge branch 'development' of https://github.com/henke101/Mindy into development