Got tabs working
More tweeks