Added logic to make traveller work. Cleaned up the views a bit