Minor refactoring and cleanup
Added ability to filter login list