Fix bars

Signed-off-by: Ramnique Singh <mail@ramniquesingh.name>
Merge sajjad's changes

Signed-off-by: Ramnique Singh <mail@ramniquesingh.name>