more improvements on styling