Bug fixes

Fixed bugs 101,102, and 103. Cleaned up some CSS.
Merge branch 'fixes'