fixing includes and styling