Fix more UI issues and scroll bars on popup