Moving From Relative to Linear layout