Added cancel icon
Added styling for user notifications
Resolved merge conflict