Changed tab stuff, hopefully looks cleaner on git