Add a new layout, run code through hlint
Another change thanks to hlint