fixed some layout and content issues