rebuilt test project, tidied up, improved settings.layout