improved naming // tabbar bug fixed // comments