refacored views to be much cleaner, all/pk/ works