basic layout work completed, just some small tweaks left