UI tweaks and adding a draft button