Overhaul of layout, stripped functionality
bug