remove js, remove fade in
add haml
added bug a boo