Cleaning up code and removing many of the compile warnings.
Decreased the margin in the header since the gap was too big. May decrease it some more in the future.