Removed useless form
Removed unneeded layout
Merge branch 'master' into martyn82