Added some UI suggestions