Updated checks and minor ui updates