many fixes and updates

updated structure layout and styles