bug fixes in master view controller