Some work on styling