I resolved a part of the problem. The invisible action buttons were a result of some modules added with the container set to none, causing it to use the container SiteName.ASCX. This container still had references to ACTIONBUTTON1 and ACTIONBUTTON2. After removing those, the containers now have the proper action buttons.
Still fighting for getting back the ability to add modules, which is unforuntately a requirement. :)