Improved UI, reduce hardcode