Improvements

New button, imageSwitcher etc