bugfix & code refactoring in MasterViewController