Improved layout. Added routes