fixing layout issues in the code base