* fixed some layout issues