Added user toolbar, layout fixes.