CSS work + HTML restructure