Form design fix