improve design
Merge branch 'master' into merge_master
finish fluid company page
Merge remote-tracking branch 'origin/merge_master'