Added check and some UI improvements