Improve some issues of styling