gallery view needs more work!