Issue ID #28 Better element selectors and refactored Admin page