Changes visual appearance and minor fixes
Minor