Added proper home functionality