UI Enhancement Second Shot!

Second shot!