UI modified and screenshot update