Removed duplicating html
Clean up layout
Update scripts and remove unobtrusive validation