Improve layout and controller classes to support embedding, implement missing user tabs