fixed some layout and content issues

Alright, after Robert messed it all up.... I think I have it right now