Rearrange management page to better use space
Merge branch 'development' into livetest