Beautification and Simplification due to hlint
Remaining beautification
Better design for large screens