finally got things looking decent on smaller screens
fixed some css formatting
fixing some merge conflicts