Added more tabs and stuff