Added tabs, did other stuff