Added new routes made design better etc