cleaned up user screen