added settings, ui tweaks