CE-44 Optimize layout of activity form