Completely reworking the layout.. unsure where I am headed :/