Finally added icon, menu functionality on the way and other UI
enhancements