changed layouts and added features

I just cleaned it all up and added the correct features for each page
along with layout options that are a little cleaner and user friendly.