Temporary fix for too many buttons