- Mergine and minor tweaks to the UI