Fix a lot of overdraw issues and indent some code