Some improvements

Minor ui and navigation changes