fixed some layout issues