Few issues with compilation and layout