some view cleanup, user storage added