Some fixes and re-styling