MUCH BETTER UI! and fixed the constraint error