Some restructuring and minor visuals