added settings
removed cancel button