New project, several design tweaks