Improved design and functionality of route wizard screen
Fixed issue with layouts