fixing width of company panel
fix conflicts
more width stuff
Merge branch 'large-displays'
herro
Merge remote-tracking branch 'upstream/master'
try to merge
Merge pull request #30 from devend711/try-merge

fixing widths