Some fixes and restyling