adjust layout & css to be a little cleaner, fix responsive margins