update
Layout and slider update
Merge branch 'master' into John_devBranch