Some minor stylistic improvements
Implemented "not for payment" switch (XXXed out)