Cleaned up code and fixed title spacing