Added additional functionality for login page and options page