Merge from dev

Sidebar added.