Fixed some UI stuff after last night testing