Get UI working
Resolve merge