Moving things around for aesthetics. Still need to figure out full design