Added sidebar, but at the moment it doesn't feel right :(