fixed some layout issues
post merge clean