Merge pull request #268 from pw374/redesign

revert last commit (part of it)
revert last commit