Fix wishlist toggle so that you can add and remove items from wishlist in one page load. Fix some indentation inconsistencies.