Made some UI considerations