Design segment control + header fix
Merge remote-tracking branch 'origin/master'