fix styles, cleanup and adjust header