Add loading bar
Fix some small details