Add some sidebar components and small changes in layout