Minor Changes in code and UI