Lastest style/layout updates