index page view and profile view compleeted
merge conflicts resolved