cleaner haml
start AJAX hookup
merge