WIP: update services layout