- fixed some layout issues