addressed several layout issues