Simplified makefile

Signed-off-by: Oleg Bulatov <dmage@yandex-team.ru>
Vertial align for layout blocks

Signed-off-by: Oleg Bulatov <dmage@yandex-team.ru>