UPD: More liberal menus
FIX: Cleanup fields