Structure changes + first gallery view without database
Fix structure changes conflicts