removed no longer needed task class, small layout refactorings