changes to UI

changed tabs names
Merge branch 'develop' of github.com:arispen/rc-2 into develop