Refactor home and user page loading