Further wok on the UI, Info popup now working