FIX: change GUI (closes #68).

In order to get closer to the first model.
MERGE: Feature #68.