Fixes #1 Still pending implement Kostache layout