refactored webuser class and main view
resolved conflicts