Add sidebar and improve view a little bit