Reorganised GUI and first draft of overview