fixed some layout and styling bugs