Improve UI, add custom graphics