Fixing up sidebar on mainpage in develop then merging with master