fixed some layout issues with merge