Appearance improvements and several changes