Initial Changes

Made the changes from the original branch to get new side bar set up.