Cleaned up slightly, also working on a "better" way of doing the different tabs