More design tweaks

And purging of unused files