Stubs for user-tabs

Also a bit of refactoring the code