Issue 506 removing extra buttons in tips view