major markup/css overhauling