Fix #176 #226
Update styles