Redesigned form to allow direct manipulation