added missing parts and finalized styles