project maps and some layouts fixes