structure cleanup

keep things more organized and consistant across pages