Fixed up layout to match 48dp grid and introduced scroll view