Fix wrong button names/places

This patch contains a fix for wrong button names vs places in various .html files.