Introduce new layout and calculate button concept. closes #4