Remove form, move controls to top
Remove js cruft
Remove use of too generic .block class