reworked ststructure and styles