Gallery finally works
Still need minor improvements