Minor Changes on UI