Design fixes and staging env

ayeks requested to merge cicd into master Feb 03, 2018