Reversion of all breakage and layout improvements
cleanup