Restructured index page
Added watchlist feature
Merge branch 'wishlist'