dev layout changes to master