Added button to toggle images
Better naming
Use correct type
Added simple editing mode