Fixed empty title bug, UI tweaks