Design changes, sidebar added
merge conflicts