moved layout css around to move relevant places, combined a few things