Custom error, bug fixes, UI impovement