Refactoring and bugfixing
Images Plus and Minus