edit idea done
resolved conflicts
ui changes