Updated templates, added sidebar support.