Some fixes with styling