Added tabs, bug fixes