Removed unused buttons and changed text.
Merge branch 'develop' of https://github.com/Visualista/Visualista into develop