restructure code, new css