Aesthetic changes and added cancel button