ticket:6 minor app logic changes