Fixed cancel-button and added ui-tweaks