fixed layout issues with constraints
added cancel button
fixed layout issues