changed stuff around
Layout is almost okay now