[CORE-97] Added building blocks, fixed menu