Keys and navigation added, need to rethink architecture of the gallery