change sidebar to tabbar, lil cleanup