Small optimization
Remove duplcate variables
Add test for Admin Screen