remove components
restructe
work on styling