Removed useless form
Removed unneeded layout