Fixing the build

& layouting