UI Changes, error checks