Implemented Logon Tab and some code refactorings