Bugfix and create a sidebar module