Refactored User features and Welcome Index