Fixed minor bugs with buttons and routes