little changes and add menu