removed support libe
reordered menu items. externalized string.
removed TODOs