few fixes, first haml form