various improvements on styling