Bugfix Work and plan view