Various changes to layout for fragment