Going through TODOs, removed floating message box