fixed layout and added cancel button