Frameworks updated for hardware button count, add back overlay