Tried to clean up some elements, but I left a couple issues since I was unsure of how to fix them. Will make bug reports for those