Add rest layer and adapt UI

Change-Id: Ia6212f6c900ce471de915f2fc41bc6655c100a65