Bottle Journey: Bug Fixes, interface improvements

Bug Fixes, interface improvements