Fixed title list and some other stuff