enhancements in forms, models and views