fixing layout issues
fixed merge conflicts