refactoring admit screen