Fixed the headers and made it more beautiful