cleaning layout
some styling
finish some styling