Form behaviour fixed
Form changing now simpler