added username field to users and updated necessary views