New 2 Column Layout Thingy
Update Some Stuff
Merge branch 'refactor/design'