Fix layout little bugs. Removed unused pages