added mtf icon and refactored some code