Silly UI hardcoding removed