Fixed layout issues, with support for 8 button display.