Fixes button, etc