Server: layout improvements
Server: layout improvements
Display if Pro version

Closes #996