Continuing work on styling