converted to single tab view. removed and tidied some of the redundant code.