[#37] Some form changes