Improving button routes