Revised tab view layout
Made more layout changes