Small tweaks on front end
That's better
Fix null pointer exception from a letftover reference to an old button