Working thumbnail view prototype; minor cleanup