Streamline UI (freeze buttons disappears). Cf #141