Minor Changes in UI arrangement