Adding collapse and expand icons

TODO Could not figure out how to get the advanced options to be collapsed at start