//Simple tweaks and UI enhancment