cleaned up user view, added completion functionality