Migrate from Relative to LinearLayout