Use tabs and fixed some issues