Fixed edit dialog layout issue.
Fixed back button behavior.