added find_by_shortcut and switched cancel and create buttons