To rebase. Contact php created.
Small style changes to UI.
Merged in latest changes on develop.