Majority of layout corrections

Layout changes made. Next step will be updating images.