More Changes to functionality and icons