Updates to the general layout. Step 1 and 2 now 90% complete. Not usable yet though :(