Fixed some bugs

Fixed some spacing issues and cleaned up the code.  Added some inline
CSS styling for now.