Refactor of User Decoration and fixes for logged out users