Revamp on styling