Big changes. V 0.7

Completely revamped the layout.