Merge pull request #47 from elihart/master

Adding text now works. Cleaned up the editor layout. Synced company suggestion list with server company list.