new layout fixed - focusables aren't working properly.