Adding tabs

Adding tabs and clean up a bit