Updates to the configuration view model to include themes
layout updates
Merge branch 'master' of https://github.com/HassanMunir/TravelPlanner