Early stages of tabs functionality and bug fixes