Add proper routing from setup screen.
Misc visual fixes.