Remade routes, added buttons