Update: A few styling UI