Structural changes and minor styling