visual enhancements and adding new options, cleaning code