Issue#234 input forms

Make input forms consistent across the application