Simplify data flow

merge css changes first