Styling changes and some tweaks to move task