Small UI fixes and removal of unnecessary script