Minor bug fixes, layout fix
Merge branch 'develop'