Fixing Layout

Made some flaws on my last layout, going through the pain of addressing
some of them now.