Added Options editing views. Editing popup is not
completed yet.