reverted a lotta UI components. CSS too tightly coupled