Re: #431 further styling