Revert bc5e178..e59e44b

This rolls back to commit bc5e1786afb891f3d0165572d4e025acf0ea0f20.
Revert ec3d636..c0cb5c3

This rolls back to commit ec3d6360569a559728b8659edac9ac2aa4ae3a7f.
experimental phase with css