Fix bugs and show atas in sidebar