More improvements on UI
Added more one menu option and section