clean up layout to be LinearLayout