Made a few quick modifications to headers and layout