UI fixes, price fail-safes implemented