More work on styling