Feature/issue#1 basic layout